Changed the functions being imported to allow for testing