More tests

Work in progress. No merging this yet.