Got tests working

Damn that was a painful