Added non-functional tests =)