Adding validations and removing unnecessary spec files