Updated Employee types, added tests