GitHub #206: Updates to test cases and testing usecases