Updated project, removed stupid tests