Streamline my makefiles
Add __main__.py to tests folder and added test suites