Added the start of some unit tests