Improvements and fix (fixtures, tests and specs) #10