First shot to add testing functionality