Moved assert class and updated tests