Changed triangle to struct, added new test geometry