More tests and assertions