Adding bit more substantial tests