Removed imbedded test cases