Feature/client unit tests

Fixed as we discussed. Annotation unnecessary since it calls public constructor.