Updated tests; device tests not working now