Finished types, and made test project