Resolved test issues, functions now work as intended