fix broken tests
keep absolute path
Merge branch 'novawave-master'
Reformatted code from #54.