[#58] Final tests are working now