tests, fixes and renames
http fix, source path fix