Test language cleanup

Added some test language cleanup