add test cases - shoulda problem at the moment...