Basic test functionality added