moved things around, got tests working