Moved test, changed wrong behaviour and lint