Develop

Better tests and some exceptions