Cleaned up tests, removed ternary operators