moves documentation and changes tests slightly