improved test, reorganized files