Added moar tests!