Added junits for #308