Clean up test and make them more descriptive