View and test fixed.