Fix code standard issues and correct type of assertion used in test.