Working tests finally!