Feature/test

Tests back to live. Still working on them. Had to reorganize things a bit.