More tests

Ready to merge