Inprove specs
Make last failing specs pass