New test, uncommented out more code