* Small organisational fixes * Add some new common tests
Co-authored-by: Troy Prelog <tprelog@users.noreply.github.com> Signed-off-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>