Added another class and fixed testing to enable assertions