Switched from static to instance

Also added exception message tests