Fixed voted for test
Removed unneeded structs