Added moar tests