Added classes to test from API