Fixed failing test and cleaned up syntax