Tests Tests Tests

[quackitsquinn]

Write tests for the code, :) This is going to be a relatively big refactor but will be worth it in the end. No more murderous NaNs :)