More tests working