Ver Starr added Unit Tests