Fixed the test annotations to denote the type of test
More explicit test messages
Fixed the outstanding bugs and added the correct parent