Changed tests, removed std::string from templates, cleanup