Feature/fix tests

Feature in progress, please do not merge until tests are fixed