Updated API, started on better tests