added tests; still broken