fix relative load paths
fix tests
rename