ADDED SIMPLE FUNCTIONAL TESTS