Tests fixed. closing #32