Adding tests, cleanup