I'm gonna stop typing messages in here...just assume every proceeding commit is relative to solving the unit test issue until I say otherwise.