Modified tests to support more than STL