Added two cases to test suite
A minor code styling fix