Added data driven & exception tests