Adding tests. Need to fix one. :(