Add tests, fix condition
Remove bad test
Fix conditions