Putzing with tests
More test putzing