Added a some stuff to a test and some other things.