Add system tests
Add util tests
Clean up