Cleaned up registration process and add test case ideas.