Updated tests closes #41