Removed redhat manifest
Some more refactoring + added spec tests