Changed tests to be less repetitive