Removed third party dependency, added test project