Getting tests partially working