Updated init and test