Updated tests part 2

close #36