Finished testing SLU and some refactoring.