Added expect varargs. Some tests and clean up