* fix exception when testing exceptions (doh) and add tests