Re-adding tests since it wasn't present in dev for some reason, fixed whitespace in stings bug, a little more tests. No more exceptions are thrown