Updated tests

Working?