Extended tests

Got code coverage up to 50%