Added tests, cleaned up unused packages