Added custom test cases, not yet ready