Made tests work
Progress