updated some of the tests
add some exception
I added question as TODOs in the test please notice