moved test stuff out of directory for compability