Moved test impl. to implementation section