merged three test classes!

Only the comments are missing