Feature #46, implemented and refactored test