Added test + added implementation of these test