added more tests and bypass the once we need to fix