Unit testing project
More tests and corrections