Moved unit tests in to tests/ directory, started adding tests