more tests.. not exactly tdd eh..