Update from brunch

added tests