Moar tests

@mereskin