Initial commit on owers tests, more refactoring