excercise 2.5 and unit tests

and crappy assertion macro