Moar tests, will rebase