added remaining tests and project features