Removed boilerplate. Fixed test numbers