test fixes and copyright
resort of attributes
cleanup