Test methods for use case 1-4 + small fixes

A lot of moving previous tests into methods with slight/bigger
modifications.