use spec reporter
reorganise tests
fix tests