Added some exceptions and static calls tests
Full rework