More tests working.