Adding additional tests. Fixed tests expecting an exception.