Got some tests working