Added new assert handling functions and worked on tests