added LUT access tests; some rearranging of classes