Finished testing current implementation