added mock modules
updated constructor