minor improvements, reorganized test project