Fixed method names and added stronger assertion to unit tests