Restructed tests so they are in separate files.