FIX: Putting tests back