added functionalities; changed test files