Move test to conventional folder, remove static from methods signatures