Post create validation + tests refactoring