Fixed stuff for consistency. Added moar tests.