Removed some of the testing stuff I won't be using
Put in some tests