Added and corrected tests

to reflect last commit.