Removed hard coding
Improve testing code