Finished checking, now creating unit tests