Move duplicate code into single place and use ternary expressions where applicable. Use static imports in tests where applicable. Original Pull Request: #210
Move duplicate code into single place and use ternary expressions where applicable. Use static imports in tests where applicable. Original Pull Request: #210