More generic tests... still broken though