added old tests (need updating)