Wrote some unit tests