Finished with the tests, gonna merge back into master soon.