Version4

More tests!!!