Modified test code to reduce clutter. Removed __name__=='__main__' from test files