Added Test Code
Some Cleanup