Adding tests, still broken