Make existing tests compile and pass, want to add more