Adding moar tests