Cleaned up some refactoring bugs, commented out invalid tests temporarily...