Updated project file and slightly more code (and tests)