Updated Build
Added more test
Updated files (cleanup)