Fixing test (for true) and then some refactor