Organized functional tests and added a few