Unit Tests Refactor

SRP - Each test should test one thing and test one thing well. Makes it
easier to figure out what went wrong later.