Added a set of functionality tests