Updated tests

Seems to be working alright up to this point