(Unstable) Adding in initial tests