Added basic exception
Finished basic expectations