Couple more small and simple unit tests to increase coverage