Add Skip tests and fix bugs.