Removed device check, for some reason it blew up and I not sure why
Implemented remaining incomplete tests