Add fixture gen
Clean up tests and logging