Add status validation and tests along with cleaning up registration forms