Amended tests to make them more comprehensive