Jimmy/Rob - #1 - Cleaned up tests a bit