Minor bug fix. List of stuff to do added in testclass