More tests

For some reason I can't fetch the remote repo so this isn't based on the up to date master.