Refactored tests so each has its own method.