Feature/more tests

Fixed missed lines of code.