Building up more Unit Tests