Rework test. Remove commented out tests