Working tests

Need to verify other system components still work