Removed useless client test, added class map