Added basic functionality for test page