Line scan prepared
Tests refactored