Switched to gtest. Cleaner structure