API cleanup + provided more tests