Added test functions;