got some tests working