added constants to userland and modified tests