UPDATE: Implemented tests