fixed testing and moved things around a bit