got remaining tests working