Adding testify lib for tests. Also more testing!